fixing comments
manual merge