Improved VS solution; fixed cppcheck messages