Improve flash-system; fix