removing longs and fixing iterators