bug fixes
bug fixes again