moved some things which should have been in hero to hero, and fixed stuff