added comments to Norbert's fixes