remove echo cruft + fix up some paths