working on fixing bugs