Small bugfixes
additinal rules added