JoergZ2 Some functions corrected