Lot's of changes to doc builder. Will review and discuss more.