Yay, stem trunk has all my changes, update the comments/documentation.