bug fixes
booyah