General Update v3

Another update with the main repository.