Rendering improvements

Including a fix for discoloration