Initial new words code cleanup
One step more towards functional diffmethod
fix two bugs
Bug fixes