updates before a rezn8d merge