re-included NOx contributions and more aesthetic changes