Proper emdashes and tidyup