Few improvements : but had to fix some bugs again...