- minor fixes
- variables from stack