Various parsing bugfixes, standardize on hero name