trying (desperately) to tidy up
updated version
Added Annie gazetters, plus numerous small changes to lexicons etc.