Added second peer review, some small code adjustments.