finalized some admin code with comments