bunch of small tweaks for impending v2 release.