fix else stupid bugs