Tuned some details in diffract implementation