modifications and such, fixed clone and added test for cloning