Corrections due to review by jodal