This adds the human readable IDs

and converts the negative if's into unless.