improve messages
fix usage.