Several changes. Additions, fixes, uniformity.

18gpbeAVjp1HoTomRoVoHPuHczAQaGWcVY