fork fixes and notes, link replace fix, cli usability tweaks