boatload of fixes