No more segfault, some valgrind errors to clean up.