More reviewing, fixing some glorious bugs