bugfixes and some more test stuff