tidied up labels and table formats