Update comments to better reflect code
Fix merging issue