updated comment handling