[update] - some bugs fixed.