lots of little bugfixes
lots of little bugfixes