Add delimiters and fix base off by one bug.