Lots of updates. Mostly command restructuring/meta data.