added some part of Unit.parse()
fixed accidental commit