Fixed up some more stuff