Various tweaks as suggested by Jeavon

Changes in terminology, MD issues and updated URL references for further
work.