Imports

Started to fix the import saga but gridaphobe pointed out a workaround, so putting on backburner. Cleaning up some of the error reports in Bare.hs.