Fix typos and YAML, remove trailing whitespace