lock adjustment and some comment