Adding missing defaults. This was causing problems overwriting variables

Fixes #69
Fixes #62