Keeping validator commented out is a pain...
Made OD require less obedience
Moved error message to left of screen
Merge branch 'master' into dev