Changed wording of Numbers to ID.
Some tidying