+ Clean ups and corrections
[melted] / src / inigo / configure