rename
squash more warnings, and pull in more internal stuff