Added copy/move feature and fixed bug