More tweaks. Mostly on solo