updated lots of stuff, last of which is the combination logic + GUI + cluster
fixed conflicts
fixed conflicts forealz