enable admin, minor code fixes