Misc mods from s2w and mpdecision
Experiemental config