Bugfixes, removing works...