Added various config variables - fixes #7 and fixes #8

Fixes #7 and fixes #8.