Bugfixes added