updated grammar files
updated data index
Updated for py3