- more fast searching (hopefully all working now)
- some simple synchronisation
- some reshuffling of methods to eliminate cruft