Misc changes
Reverted to a previous version of the Board which seemed a lot smarter.  Thank God for version control