- finished definitions
- fixed structure errors
- added first draft of search capability
merged