add cannon & net to hardware, minor changes in match setup