Issue 3545

Mostly typos and getting the source actually in sync with production