fixed some bugs, but notice I should have done the ignoring  work first.