Some cleanup and better logging for weyland config.