Cleanup

- Minor changes to the Volume scaling (not a 5% drop anymore)
- Cleaned up working directory