iteration + fixes