Better capability handling and more cli options.