started fixing bugs