bugfixes, new rules