doc and comment improvements