Final amends before live push

Final amends before live push