code fixes
swapping buttons
Beta1