House keeping

and some work on friendly item names