Whitespace fixes.
More checking etc of talbe info query.