Cleaned up for 1.0. Ready for release.