(1) Assorted bug fixes
(2) Simplified garbage collection