fixes #752
final fixes, done
took qe out of for loop
took module out of for loop
Merge branch 'gidden-i752' into develop