0.2.0 Part 2: Fixed Stuff