added admin, changed some function names