bub fixes
bug fixes