- Adapt Version Information
- Fix some minor errors