More fixes to spacing and some incorrect sed.