fixed some pointer- and loop-based derps
more pointer-based derp