cleanup
set some explicit options; fix stop