Adding --version, cleaning up --retag.