a few tweaks
some small tweaks
reverting some rule structure for debugging purposes