minor bugfixes
iteration optimalisations

iteration optimalisations by index/ by iterator/ by reference by case
scenario