A few fixes + draft Interweave and Takenmake. Only 1 1/2 variant to go now :)