find tuning and fixing bugs