Fix various issues with formatting in source files. Still sfp will not process itself.