Shift uppercase the correct amount too, fix dropping last char of message