Cleaning up more memory.  Bug fixes.