Started implementing upgrades to disambiguation etc.
Completed disambiguation-related work