More comments, better logging