lots of fixes to make it more OO, calc mass and stiffness