Updates for 5.4 settings

Just a few things to tighten up.  This is just a pass to refactor and ensure the best setup possible.