more if statements

Added more if/then statements to have all the instances work.