More fixes for level1, some shader updates