fix bug and little conflicts....