Fix an out of bounds access reported by valgrind. This takes care of all the valgrind errors I've seen so far. Still a few more memory leaks to take care of though.