Added trade item group management.
code cleanups