Add better error handling and help messages for bad commands