lost of small fixes and more stable