some fixes
bug fixes