Added sub_builds and a couple changes to wc & ss