Major round of updates from client work.