corrections to remove_current() and copy constructor