FF13 fever
Merge & fixup