Fix config

**Ready for testing**

Implement changes in #68