tuning + bug fix + more hardcore