Annotation/Comment update

Further comments added.