Mainly comments fixes.