Fix some comments and variable names (no behavior changes)
Try to rename the transform variables a little more meaningfully

(no real progress debugging though.)