fix a typo and add cleanup operations. This also switches on memory leak
checking (which is how the rest was found).