prepare for memory pool, valious fixes
merge