oups, fixing bugs