minor fixes, output table rather than list