Final Commit Before Project Deadline

- Minor tweaks, fixes and general changes