minor cleanup + config merge fixes