cleanup & bugfixes
bugfixes