fixed some outstanding config file naming issues
simplification of handler spawning