changes for MW rig conversion

Signed-off-by: Mark Histed <mhisted@gmail.com>