Fixed generic mass matrix calculation
comments cleanup