Lest development before closing the Dev016
Small corrections with memory leaks