Few changes

- .dup is now .deep_clone
- Some other fixes
- Still somethings left to fix