fix bug and other...