Fix: Prevents iterating on null

Fix: Removes duplicate .data

Fix: Updates dist to reflect change

Fix: Removes reference to non iterable element