Numerous updates. Merged versioner project.