Fixed Ctrl-Enter bug from old code.
Split pixel looping into modifying and non-odifying variants.

Also renamed library stuff to be more in-line with the new naming scheme.