fixed some eror