forgot to switch branches but added fixed decimal places and descriptors to return values