Remove some code duplication
Fix diffraction propagation path
Fix vertical diffraction path search