Parameters tweeks and threading corrections