bug fix, remove database lock feature, completed