Working on some link generation fixups and other tweaks.