Almost have shaders working again.  Woop!
Improvements.
Minor improvements.