Lots of updates for final push