cleaning, clarifying and extending the build options