typos and final TODOs
Merge remote-tracking branch 'origin/layout'