Add units to pressure+velocity
Remove gauge suffix - handle this where needed instead