Additional doc and comment improvements