- Fixed some binding issues
- Wrote some unit tests