some fix
fix all leaks