Another fix for VS2013 (issue #3), plus comment tweaks