JJ tweaks
More proof reading