more stuff, fixes