some bugfixes from last step