+ restore lost changes, improve whitspaces, suppress useless MSVC warnings