fixed one bug and possibly another one