optimized the typesystem for comparables
improved units (checks for composit units)
merged
merged