renamed some vars & added choose on click!

Bug from last time still there