redid some bugs gilbert had worked on.