fix comment tokens here as well