updated all source files to be consistent with those provided by TA in email