add destructor glue
small cleanups.