args & doc cleanup
add and remove