Some updates to make taxonomy a little clearer