More cleanup and changes, mostly in Find.hs