fixed some if/elifs