More fixes, added actual tokens for <chunk>offsets