96 - first pass of fixing a few more n+1s

[mooreniemi]

Basically everywhere you see where you should be suspicious. :)