Change the build scripts some.
Get rid of some TODOs

Do more system introspection.