Worked on fixing bugs