add branches and fix a derp...still more derps to fix