add comments for implement issues & minor fix