added units and a little formatting (though it's still rough)