Fixed if else statements

still many mismatched types still