Final tweaks
Merge https://github.com/ruffsl/CS7630P1
Just changed length