First set of discover fixes/cleanup
Import script and various fixes