ruleJS improvements