multi control working, fix a few bugs
Merge remote-tracking branch 'origin/multicontrol'