Amazing updates to gbs-build options helper; and org files