small fix
bug fixes
small fixes