Various enhancements to app, including proper headers to all files #11