updated rules and expression editor