Better configuration handling, fix logging in supervisor