Improve character switching mechanic so as not to set player to null and
to set fields on active character as opposed to new character