comments and move Change of Cursor as last thing to do in a patch