Diverse log improvements, comment additions and small refactors.

Diverse log improvements, comment additions and small refactors. #1259