minor code cleanup, addition of new Admin permissions