More comments, better error messages, fixed CEO missing end