some bug fixes with move simulation