Many Changes towards getting FMU v1 working