Minor mods, comments changes etc.