Major Commit: Merged Files and Fixed Minor Bugs