misc changes and some builds.  Mostly move arounds in code, making names easier to identify