handle comments correctly