Many bug fixes.

Iterating toward more stable user/system configuration