fixes and admin updates