Address initialization problems. Syntax fixes as I went.
Address initialization problems. Some minor fixes as I went.

From gerald-lindsly pull/130 merged manually