Adapt for partially full point buffers
Fix a bad comment