Output formatting
Added lookup for items by id/uuid
A bit of cleanup