updated rules

* added manual tag
* some rules needed tweaking (found by validation)