numerous fixes, there is still big memory leak