and more fixed comments