[wallace] working on link scenarios and cleanup tasks