More comment and token fixes