* some mem leaks fixing