more stuff, bugfix or two