MAC and MILLIS in response, plus minor enhancements