Switched to using Longs instead of Integers for some accumulators. Also
made the layout better, and tweaked the timing.