Builder TODO fix, doc updates

Builder update fixes failed tests in Test::Mocha