slightly improved but still crashy