a bit of reorg and some small wording changes