Fixed some iteration artifacts
Merge branch 'master' of github.com:hwh33/PrisonerExpress