Tidy-up, some bug fixes around locking, expanded README.