Modify rule feature + bug fixes
bug fixes