=a lot of fixes