Fix a few parsing issues.
update tutorial with more details