- inlining
- fixing tests
- allow project to compile