Reworking some shader stuff