YN98Fast and OneStructFast fixed, still needs speed-up