small fix
cleanup
more