Working on fixing bugs