Fixed some simulation issues, but not all