Fix 2 stupid always true checks
Update status messages/counter
Iterate with an iterator