Many bug fixed