Tidy ups for exporters
Added some missing commands