Fixed issue #26 (hopefully!) and decreased lock times in several other places.