fix created bugs with returning to normal edit mode, fix bug with paste persistence