bug fixes and iterables
improve iterables