Add some new rules and improve some rules
Add some new rules and improve some rules