Fix some shader errors, work on Surface, etc.