extending gitignore
minor cleanup, some docstrings, added form token queries