working on cleaning up admin, and other bug fixes