Updates; some fixes

Still leaks