Betterconf

Start of #138 and #34