- Rename some variables
- Minors fixes