vs 2.0 - comments + minor changes