New simpler application lock and other responses to coomments.