memory leak ficed (again)
todo updated