Cleaned up more parts of the code that I missed. Places with '//JARED' comments is commented out code done by me. Ask me about why it is commented out if you have questions.