Update joint estimation
Choice density and random wage draws
Comments and corrections
Bugfix