Ampersand escape fix, string formatting fix