Change title
Add small fixes