Fixed the components for conceptual shading

Also fixed the bug with HBSrf