I think I hurt something laughing at Filch making “Mackerel pudding with creamed spinach and tomato soup aspic" and Snape thinking the House elves had gotten into the cooking sherry again.
Excellent story, Filch did a wonderful job "managing" Severus