more changes

to fix last Else statement