Fixed the last 60 errors and some 10 warnings
Merge branch 'master'