done fixing bugs