Better error messaging
Improved CLI