small fix
missing code
more fixes