Added copy and paste and other enchacements