Major Cleaning up and Fixing!