link cleanups and more bodgets