fixed const_iterator and added const find