renames & bugfixes