[FIX] Some rules were wrong; corrected based on feedback