increase some functions&fix bugs