Also help plug some memory leaks pointed out by Mike McCormack.
Attach a file by drag & drop or click to upload
