a few corrections for VC++ 2015