moved pbar update to inner loop
changed pbar option to progress
added count() to QuerySet
removed generator code