updates table mostly complete
Merge remote-tracking branch 'origin'