links and fussing per issue #29