Completed the remove function, and made very minor changes to find