Add Shader support. Fix some small issues.