improving code, fixing bugs