Loading changes hero instead of creating a new one

minor changes and cleanup