Move partners around + fix various issues.