Fixed some lingering bugs in converter, ifs/elses should be compiling correctly