continue fixing bugs