demo updates
Merge branch 'demoupdate' into compat
send socket shouldn't fail, keep trying
Merge branch 'demoup' into compat
user ctrls
Merge branch 'ctrl' into compat