Add features, fix usage.