Post-deadline update - mostly fixed