More tweaks, better destructors and callbacks.