- Some bug fixes
- Extract to new project