assorteassorted bug fixes
bug fixes