Refactored, added error highlight to element, added Save/Match
functionality for run-time verification