Ported table-as-container and fixed function omissions and mistakes in the library files.