some bugs fixed.
merged remote