Put comments at end of line and fix two message keys.