* some bugs fixed