minor changes and header comments change
msvc compile fix