fix des bugs :) all is allright now