minor edit
more fix and memorey save