- fix a load of issues with inheritance and cloning