fixes, and added a destroy method