TSAGE: R2R - Minor cleanup: update some todos, use american instead of british english, ...