Comments done. Minor tweaks