Fixed bug in serve_file

... and eliminated some cruft there.