Fixed up a lot