Minor metadata table tweaks after double checking the spec. #7
Also TableIndex type tweaks.