Added error message macros + some RuleNumber code