Fixed some concurrent modification exceptions

need some help working the movement class :/