corrected some types