added builder, tweaked input options