Move vars around a bit.
Fix broken path.
Merge pull request #98 from greboid/master

Move vars around a bit.