changed unit converters part 2

Now do you see why I had those macros?