Mike commit

-merged Armin's and Daniel's codes

- Jtable can't change values

-newMomentum not working