Final tweaks to the code, text, and slight styling changes
solved conflict with ben now merging
solved conflict with ben like a pro