cleaning & bugfixes