final sim bug fixes