'search' subcommand added.
Some improvements.