Fix two leaks, fix to use standard method naming conventions to allow useful static analysis. Some issues remain.