Improved commenting, reduced the likelyhood of distance estimates being off due to improper locking