Balance changes and a couple tiny refactors.