Eliminate race conditions

Also receive multiple points with a single lock.
Merge branch 'master' of github.com:StackExchange/scollector