Fixed some scope issues.
0.1.1