Fixed up more stuff