lots of fixes!