tidied up markup in order to simplify branch merge with experimental

Author: jkbzh