Increased registration robustness, updated CLI.