Few corrections here and there