Minor additions, having problems dealing with the table format.