Better help messages, better error handling