mostly cleaned up the little link reorg, but still some rough edges