misc
3 more bugfixes