New version!
a few fixes