Improved Proportion tables, other changes.  Up to date as of Jule 15