Cleanup, small speedup and probably some fixes to shield link.