Fixing markup and spelling