tweaks
Merge branch 'configure'