Adds a couple 'to do' comments to comments that discuss possible issues given some rare circumstance that might occur