Better error handling
Cleaner UI, plus better defaults