small updates to help with the first run.
improvements to how startup is handled