dealing with completeness correction referee comments

+ some cleanup of shortcuts