More fixings and hackings to make the iteration stuff somewhat work