config tweaks, and better startup handling