word diff + cleaning of old diff code. Some cleaning left to do.