Garbage collection, fixes and updates