Comment improvements (thanks carljm!)