comments fixes, please squash