Added tox
Cleaned up grammar/parsar