Fixed the parts that weren't borken