bugfix-Destroy

Fixing problems with destroy. Also, other minor issues.