minor performance tweaks
Massive rename in preparation for ogl vs j2d.