spelling errors and man dash hyphen slash
Merge branch 'tweaks' into upstream