const addition changes from brian, awfulhak.org