Fixing helper functions to utilize updated taxonomy names and some more error checking