Further paste tool improvements, formatting