more robust wrap and quote