More accurate rules
Small syntax fixes