Additional changes from NU server

Gathered remaining changes from the server to get into version control.