new preconditions and bugfixes