Fix broken trait list, use full names

Also display 'None' if no traits of that type

Fix #47