Comments added and finishing done