Minor improvements + Comments.