Tweak some imports. Update some docs.