small_changes_blanks

Fixed a few lines of code that left extra blanks in some strings
conv_labels

Update the conversion macro to pull across the label from one variable
to another