some bugs fixed, normal commit reverted