fix switch
ssh wrapper
merge w master