Removed debug, misc admin main changes