parser changes

height with weight swich
all Types to Usi