more wiring up, plus some uncrustify