So many fixes.
Review comments.