progress fixing bugs