Fix incorrect normal calculation
more cleanup of shaders