Bunch of fixes. Very fix, much new