revert back to a single file; makes error messages possible
lighten penalty on pagebreaks between code lines; much better formatting