main and big update of fixes