registration with locks and bug fixes for jaro 2014