several changes to use local definitions and responses, and quick fixes

1 job for fixes-for-nslcm
in 0 seconds, using 0 compute credits, and was queued for 10 seconds