admin fixes and improvements