Update paste plugin to allow bypassing
Tidy some events