valgrinded, more fixes to come