Fixed some if/else/elif goodness