Fixed cloning issues, better example'