added back names in non-fungal kingdoms, comments and some refactoring