Bug fixes to cut down on errors, file headers updated