more fixing bugs