Lots of little changes to fix build. Build still not fixed after last committs, but have other time committments will fix later. Modified names, and functions and some structure of the code so that the user setup ability for commands will work properly.