Reviewed some mistakes