Add comments to count-alive, minor cosmetic changes