Ordering

This changes the ordering of some tasks to be more robust and less disruptive with service restarts for idempotency.  It also includes some other ad-hoc changes and alterations.