Wrapped up most fixme comments, a few left for Jarrod's last pass.