db6a50e
Make corrections according to Josef's feedback This is the first run of fixes suggested in the review.