Modifications from Master to 3.8 version : Part 3

Tabulation ans syntax fixes.
Links fixes