several minor updates for better readability