Memory leak's fire wall updated.

Also a great mess!