fixed a few bugs(kaibosh)