lots of small bugfixes