Fixed up lots of good stuff