cleanup
fixed warning, missing param
more cleanup