add auto-deletion of objects
tweak output
fix output