moar improvs still segmentation faults though fak