minor changes
add comments