Refixed everything

Still have major bugs that need to fix. Worked as much as I could
without help.