Various changes - still experimenting.