bug fixes with shading/ other small changes