small enhancements
add comments