updates to handle more grunt copy-paste work