Huge Nu API clean up / update.