+ Comments
+ Cleanups
+ BumpShader is separate class (WIP)