minor changes based on MatN reviews