cleaning & bugfix