Last updates before checking out unity for a client

Last updates before checking out unity for a client