Some majority changes:
- all models changed to query model, better speed
- close #17