Plug a memory leak and update some comments, from Tiago Cunha.