- streamline paths
- hotfix @jhnns