- added bugfixes