Revised some of the table functions.