renamed all __*() functions to _*()
fixed 2 small memory leaks

[r6364]