add some comments
add some comments in handlers