administration impl and ergonomy improvements