simplify admin.
add missing methods.