Some updates
Update stuff

- Scala
- Z