Updated Character Offsets

Character offsets were a little off. Also reduced warnings from
ReSharper.