Cleanup, fixes, speedup, shading.