Various changes. Trying to get this in shape for initial release.