initial
merged
fixed bugs in the static evaluation
implemented static types for unit coversions