Added destructors and updated constructors a little