Add "names" and relax requirements on habitat
Minor tidying up