Fixed some formatting issues for multi-config injections.
cleaning up merge issues. formatting fixed now.
merging