Fixed some oversights, added more useful error alerts in admin.