Fix underscore version in make, add features and strong arm, developer modules