fixed some const iterators problems, bad commit