Some changes and pulling from my repo.