Many bug correction