Metadata for both tables and columns, small bug fixes