Bug fix + Movement overlay incorrectly redraws on second move