fixed up more stuff