Reword some of the warning, fix comment preservation