fixing bugs?