small fix
more fixes