v1.0.0

Minor cleanup and some added features.