Added and updated more comments.
Added test cases for comments.