Bunch of fixes...