unpack, setup and installation works for me so far

- A few changes of variable names
- Minor refactoring