Adds safety measures to turtle resets
Merge branch 'reset-fix'