fixed some types which I had swapped