lots of fixes!!!