chagned some types, small fixing