Added if then else. Updated type checker