random fixes and admin