More cleaning and prepping for initial release.