[Fixed] minor bugs