P119: Fixed and tweaked logic and comments.