doc comment
Some anti-lockup fixes