Next small changes.

Virtual destructors and polymorphism