Normalised shader classes and fixed drawing bug