Fixed up most of the last few errors (3 left :D)