Added additional rules and fixed several abstract validation bugs.
Minor changes and bug fixes.