cleaning + bugfixes