bug fixing
add comments