version 0.2, grammar changes, refactor, minor edits