Tidying
Minor factoring
Main tests
Hero location and ID
is-hero checks
Draw hero in centre