Cleanup & Updated version numbers.