Done a little bit about garbage collection.

Made some routines a little bit more robust.