Fixed the constructor and destructor a bit, and made changes to add and find