restructured admin stuff and fixed warnings