A few little fixes

ok, I'll change that to stay with ifs.