- some bugs fixed