added remaining matf-classes. further improvements