Updated some stuff in Mechanics