Not a lot.. cppcheck/valgrind errors still present