Fixed and added stuff in admintools