Merged klaus x13,x15 fixes. Optimized fugue 2-3%