Fixing reviews

Merge at will, missing just augfacter and/or aug.load review fix, anyway we'll see in your PR which review comments will be outdated.