Update: API, fix bug
- Fix major bugs