Various bug fixes/cosmetic changes
Corrected a bug in IfExpr