started on junit test for iterator

also added some todos, cleanup