Reverting Some Changes to Other Commit

Cleaning Up the code a little bit and fixing up some functionality (may have broken some things, too).