I would also suggest not tying the visa to a particular employer. The current system makes H1Bs easier to exploit.
> An eligible H-1B worker can change employers as soon as the new employer’s nonfrivolous H-1B petition is properly filed with USCIS.
The current system works like if every tourist had to first ask Disney to apply for their visa before coming to Orlando.