Updated surface shader, but still problems...