Fix message formatting and CS problems. Closes #700