Many updates from initial commit.