various changes....better edge recovery