bug fixes
fixing bugs