fixed segfault in iterator, need to think about how to avoid if statement for initial move