Text changes & fix from John Paul