Final Code Changes

Final changes to code for the project.