Updated the mass matrices and various and fixed world coordinates