General cleanup and comment corrections.