commenting and some mods