Further adminOption progress, cleaned up some code