eliminated two hacks in reconfiguration
fixed reconfiguration on startup race condition