New mods and comments according to Mikael's suggestions.