Some changes

Changed by proposals 1, 2, 3, and 5.