Fixed issue with hero set strings having extra commas at end
Added check for having a reroll available (Incomplete)