small fixes
bug fixes