cleanup
add some useful wrappers