latest pass, improved distance calulations, added menu item to remove original source