some more Matt updates