Added further features to the shader system. Also minor changes.