corrections based on Istvan's remarks vol1