Fixing animation bug, improving map interaction