Progress on allocation; misc. adjustments