Comments improved (a lot)