Dev merge into master

Adding validations to all admin tools and various bug fixes.