bugfixes
big refactoring: text removed