Tidied up line lengths; progress on JsonBuffer