New Version

Updates and fixes