few tweaks from live tests