bug fix
more fixes