added framework changes
added rules to framework
added more rules and updated regex
merge fixes