e020 fixes + mass matrix code