several changes and other thing I don't remember

but it seams to work! \o/