made config more easily modifiable. Some fixes.