fix 2 bugs
bug fix
some fixes
bug fix