Fix messages
Fix cli options