parsing out comments correctly, recommit