Minor fixes, fixed the const-ness of iterators in TreeSet