Developer doc tidy 3 rebased

This is PR #254 rebased to develop