Move and link commands, more robustness, etc