Small updates to mechanics