Did work on fixing bugs