whole bunch of fixes.