merge in @dchote's changes and update v3 links