some minor fixes and renamings
some more stuff