-improved admin
-fixed bugs after UGI data test