Small reworks to fit new player features