Fixes to startup flow, refinements to logging
Reorganize state maintenance