Some morning updates. Memory leaks work in progress